widget: Remove goto usage in widget_allocate()

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 4a765edf3640485da2632d2149e944d2284ce3af..8271a515cb3f8ab2d2bf4e001925f95a760842da 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4061,52 +4061,53 @@ gtk_widget_allocate (GtkWidget    *widget,
   if (!alloc_needed && !size_changed && !baseline_changed)
     {
       gtk_widget_ensure_allocate_on_children (widget);
-      goto skip_allocate;
     }
+  else 
+    {
+      priv->width = adjusted.width;
+      priv->height = adjusted.height;
+      priv->baseline = baseline;
 
-  priv->width = adjusted.width;
-  priv->height = adjusted.height;
-  priv->baseline = baseline;
-
-  priv->alloc_needed_on_child = FALSE;
+      priv->alloc_needed_on_child = FALSE;
 
-  if (priv->layout_manager != NULL)
-    {
-      gtk_layout_manager_allocate (priv->layout_manager, widget,
-                                   priv->width,
-                                   priv->height,
-                                   baseline);
-    }
-  else
-    {
-      GTK_WIDGET_GET_CLASS (widget)->size_allocate (widget,
-                                                    priv->width,
-                                                    priv->height,
-                                                    baseline);
-    }
+      if (priv->layout_manager != NULL)
+        {
+          gtk_layout_manager_allocate (priv->layout_manager, widget,
+                                       priv->width,
+                                       priv->height,
+                                       baseline);
+        }
+      else
+        {
+          GTK_WIDGET_GET_CLASS (widget)->size_allocate (widget,
+                                                        priv->width,
+                                                        priv->height,
+                                                        baseline);
+        }
 
-  /* Size allocation is god... after consulting god, no further requests or allocations are needed */
+      /* Size allocation is god... after consulting god, no further requests or allocations are needed */
 #ifdef G_ENABLE_DEBUG
-  if (GTK_DISPLAY_DEBUG_CHECK (_gtk_widget_get_display (widget), GEOMETRY) &&
-      gtk_widget_get_resize_needed (widget))
-    {
-      g_warning ("%s %p or a child called gtk_widget_queue_resize() during size_allocate().",
-                 gtk_widget_get_name (widget), widget);
-    }
+      if (GTK_DISPLAY_DEBUG_CHECK (_gtk_widget_get_display (widget), GEOMETRY) &&
+          gtk_widget_get_resize_needed (widget))
+        {
+          g_warning ("%s %p or a child called gtk_widget_queue_resize() during size_allocate().",
+                     gtk_widget_get_name (widget), widget);
+        }
 #endif
 
-  gtk_widget_ensure_resize (widget);
-  priv->alloc_needed = FALSE;
+      gtk_widget_ensure_resize (widget);
+      priv->alloc_needed = FALSE;
 
-  gtk_widget_update_paintables (widget);
+      gtk_widget_update_paintables (widget);
 
-  if (size_changed)
-    gtk_accessible_bounds_changed (GTK_ACCESSIBLE (widget));
+      if (size_changed)
+        gtk_accessible_bounds_changed (GTK_ACCESSIBLE (widget));
 
-skip_allocate:
-  if (size_changed || baseline_changed)
-    gtk_widget_queue_draw (widget);
-  else if (transform_changed && priv->parent)
+      if (size_changed || baseline_changed)
+        gtk_widget_queue_draw (widget);
+    }
+  
+  if (transform_changed && priv->parent)
     gtk_widget_queue_draw (priv->parent);
 
 out: